From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 14 Jul 2010 07:40:52 +0000 (+0300)
Subject: Fix bug #6609.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~18^2~589
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=958b4e05b8f7fd4bac28b1aecbd09bf2972d0bf8;p=emacs.git

Fix bug #6609.

 w32fns.c (x_set_foreground_color): Fix setting the cursor color
 when it's the same as the old foreground.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 23e487bee1c..ccbbe596de4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-14  Eli Zaretskii  <eliz@gnu.org>
+
+	* w32fns.c (x_set_foreground_color): Fix setting the cursor color
+	when it's the same as the old foreground.  (Bug#6609)
+
 2010-07-10  Chong Yidong  <cyd@stupidchicken.com>
 
 	* xfaces.c (realize_face): Garbage the frame if a face is removed
diff --git a/src/w32fns.c b/src/w32fns.c
index 8fabb13fb82..9df243ede7f 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -1353,7 +1353,10 @@ x_set_foreground_color (f, arg, oldval)
   if (FRAME_W32_WINDOW (f) != 0)
     {
       if (x->cursor_pixel == old_fg)
-	x->cursor_pixel = fg;
+	{
+	  x->cursor_pixel = fg;
+	  x->cursor_gc->background = fg;
+	}
 
       update_face_from_frame_parameter (f, Qforeground_color, arg);
       if (FRAME_VISIBLE_P (f))